Slightly clean up externalizeUTWithJson #1531
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Download the artifacts for this pull request here: GUI:
CLI: |
VladiStep
reviewed
Dec 21, 2023
UndertaleModTool/Scripts/Community Scripts/UndertaleWithJSONs.csx
Outdated
Show resolved
Hide resolved
VladiStep
reviewed
Dec 21, 2023
Comment on lines
-69
to
-90
| if (Data.GeneralInfo.Major < 2) // Undertale PC (GMS1) | ||
| { | ||
| ImportGMLString("gml_Script_textdata_en", @" | ||
| if (variable_global_exists(""text_data_en"")) | ||
| ds_map_destroy(global.text_data_en); | ||
| global.text_data_en = scr_84_load_map_json(program_directory + ""\lang\"" + ""lang_en.json"");"); | ||
| ImportGMLString("gml_Script_textdata_ja", @" | ||
| if (variable_global_exists(""text_data_ja"")) | ||
| ds_map_destroy(global.text_data_ja); | ||
| global.text_data_ja = scr_84_load_map_json(program_directory + ""\lang\"" + ""lang_ja.json"");"); | ||
| } | ||
| else | ||
| { | ||
| ImportGMLString("gml_Script_textdata_en", @" | ||
| if (variable_global_exists(""text_data_en"")) | ||
| ds_map_destroy(global.text_data_en); | ||
| global.text_data_en = scr_84_load_map_json(program_directory + ""\lang\\"" + ""lang_en.json"");"); | ||
| ImportGMLString("gml_Script_textdata_ja", @" | ||
| if (variable_global_exists(""text_data_ja"")) | ||
| ds_map_destroy(global.text_data_ja); | ||
| global.text_data_ja = scr_84_load_map_json(program_directory + ""\lang\\"" + ""lang_ja.json"");"); | ||
| } |
There was a problem hiding this comment.
Have you checked if ""\lang\\"" can be ""\lang\"" for GMS 2?
There was a problem hiding this comment.
this shouldnt matter.
it essentially wants to do program directory + \lang\ + lang_ja.json (or lang_en). Hence why I replaced it with a slash, as that then also works for all operating systems properly instead of just Windows. and these two paths program_directory/lang or program_directory/////lang are the same.
VladiStep
reviewed
Dec 21, 2023
UndertaleModTool/Scripts/Community Scripts/UndertaleWithJSONs.csx
Outdated
Show resolved
Hide resolved
VladiStep
reviewed
Dec 21, 2023
Comment on lines
-157
to
-216
| if (Data.GeneralInfo.Major < 2) // Undertale PC (GMS1) | ||
| // Undertale PC (GMS1) | ||
| string input = File.ReadAllText(Path.Combine(langFolder, "lang_" + language + ".json")); | ||
|
|
||
| string pattern = ".*ds_map_create\\(\\)"; | ||
| string replacement = "{"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| // Undertale Switch/Probs other consoles (GMS2) | ||
| if (Data.GeneralInfo.Major >= 2) | ||
| { | ||
| string input = File.ReadAllText(Path.Combine(langFolder, "lang_" + language + ".json")); | ||
|
|
||
| string pattern = ".*ds_map_create\\(\\)"; | ||
| string replacement = "{"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| pattern = @"\\"; | ||
| replacement = @"\\"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| pattern = @""" \+ '""' \+ """; | ||
| replacement = @"\"""; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
|
|
||
| pattern = @"'""' \+ """; | ||
| replacement = @"""\"""; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
|
|
||
| pattern = @""" \+ '""'"; | ||
| replacement = @"\"""""; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
|
|
||
| pattern = @"'""'"; | ||
| replacement = @"\"""; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
|
|
||
| input = input.Replace(@"\"",", @"\"""","); | ||
|
|
||
| pattern = @"ds_map_add\(global\.text_data_.., ("".*""), ("".*"")\)"; | ||
| replacement = @" $1: $2,"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| pattern = @",\n\Z"; | ||
| replacement = "\n}"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| File.WriteAllText(Path.Combine(langFolder, "lang_" + language + ".json"), input); | ||
|
|
||
| IncProgressLocal(); | ||
| UpdateProgressValue(GetProgress()); | ||
| } | ||
| else // Undertale Switch/Probs other consoles (GMS2) | ||
| { | ||
| string input = File.ReadAllText(Path.Combine(langFolder, "lang_" + language + ".json")); | ||
|
|
||
| string pattern = ".*ds_map_create\\(\\)"; | ||
| string replacement = "{"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| pattern = @"ds_map_add\(global\.text_data_.., ("".*""), ("".*"")\)"; | ||
| replacement = @" $1: $2,"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| pattern = @",\n\Z"; | ||
| replacement = "\n}"; | ||
| input = Regex.Replace(input, pattern, replacement); | ||
|
|
||
| File.WriteAllText(Path.Combine(langFolder, "lang_" + language + ".json"), input); |
There was a problem hiding this comment.
The same question here as for lines 69-90
Co-authored-by: Vladislav Stepanov <[email protected]>
colinator27
reviewed
Jun 2, 2024
UndertaleModTool/Scripts/Community Scripts/UndertaleWithJSONs.csx
Outdated
Show resolved
Hide resolved
|
This should probably be redone when the Underanalyzer decompiler is merged in. In its current state, this script produces invalid JSON, due to the regex hacks of parsing the decompiler's output string (so we should hold off on merging). With Underanalyzer, the AST can be directly returned from the decompiler, skipping the step of printing to a string, and allowing a simple iteration over the raw string contents in the tree. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
See title
Caveats
I did not test this at all